Calculate Clusters resourceCount from BundleDeployments instead of GitRepos #3102
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aruiz14
changed the title
aruiz14
force-pushed
the
cluster-resources-from-bd
branch
from
b7f3e65 to
c00959f
Compare
aruiz14
commented
Nov 27, 2024
weyfonk
reviewed
Dec 3, 2024
aruiz14
force-pushed
the
cluster-resources-from-bd
branch
from
602143e to
f295c3f
Compare
weyfonk
approved these changes
Dec 4, 2024
aruiz14
added a commit
to aruiz14/fleet
that referenced
this pull request
Dec 12, 2024
aruiz14
added a commit
to aruiz14/fleet
that referenced
this pull request
Dec 12, 2024
aruiz14
added a commit
to aruiz14/fleet
that referenced
this pull request
Dec 12, 2024
manno
pushed a commit
that referenced
this pull request
Dec 18, 2024
manno
pushed a commit
that referenced
this pull request
Dec 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refers to rancher/rancher#46916
Description
status.resourceCountsforcluster.fleet.cattle.iois calculated from GitRepos statuses, which include an equivalentresourceCountsfield. This causes the count to be incorrect, since a GitRepo could deploy resources to different Clusters.How to reproduce the issue
status.resourceCountsis wrong, since it also includes resources deployed to other namespaces.Description of the fix
This can be fixed by populating
Clusters'status.resourceCountsfrom their respectiveBundleDeployments, similarly to how it's calculated forGitRepos. In order to do this in a clean way, I had to move that code out of thegitopsreconciler to its own package.In addition, I've added some changes to make the existing code a bit more efficient:
bundleDeployment.Itemswhile it's being modified, removing the need to keep a separate map of deleted objects.forloop.repoKeytype, which was the same astypes.NamespacedKey.